merge emacs-23
authorKenichi Handa <handa@m17n.org>
Tue, 22 Feb 2011 00:42:45 +0000 (09:42 +0900)
committerKenichi Handa <handa@m17n.org>
Tue, 22 Feb 2011 00:42:45 +0000 (09:42 +0900)

Trivial merge